win32: Don't include gdkinternals.h

diff --git a/gdk/win32/gdkclipboard-win32.c b/gdk/win32/gdkclipboard-win32.c
index 87f83d125040b10448b1ffb0c544c28921b3aa53..36d56b8b53e3c69d5ed13c9b512d691145f005ab 100644 (file)
--- a/gdk/win32/gdkclipboard-win32.c
+++ b/gdk/win32/gdkclipboard-win32.c
@@ -20,6 +20,7 @@
 #include "gdkclipboardprivate.h"
 #include "gdkclipboard-win32.h"
 
+#include "gdkdebug.h"
 #include "gdkintl.h"
 #include "gdkprivate-win32.h"
 #include "gdkhdataoutputstream-win32.h"

diff --git a/gdk/win32/gdkclipdrop-win32.c b/gdk/win32/gdkclipdrop-win32.c
index 2c3eab6d36bd0d2bed1658886e838ed9da11d459..5fa826c2610b9f6b8359005829266fb805f9096e 100644 (file)
--- a/gdk/win32/gdkclipdrop-win32.c
+++ b/gdk/win32/gdkclipdrop-win32.c
@@ -273,18 +273,21 @@ Otherwise it's similar to how the clipboard works. Only the DnD server
 /* for CIDA */
 #include <shlobj.h>
 
+#include "gdkdebug.h"
 #include "gdkdisplay.h"
 #include "gdkprivate-win32.h"
 #include "gdkclipboardprivate.h"
 #include "gdkclipboard-win32.h"
 #include "gdkclipdrop-win32.h"
 #include "gdkhdataoutputstream-win32.h"
-#include "gdk/gdkdragprivate.h"
 #include "gdkwin32dnd.h"
 #include "gdkwin32dnd-private.h"
 #include "gdkwin32.h"
-#include "gdkintl.h"
-#include "gdk-private.h"
+
+#include "gdk/gdkdebug.h"
+#include "gdk/gdkdragprivate.h"
+#include "gdk/gdkintl.h"
+#include "gdk/gdk-private.h"
 
 #define HIDA_GetPIDLFolder(pida) (LPCITEMIDLIST)(((LPBYTE)pida)+(pida)->aoffset[0])
 #define HIDA_GetPIDLItem(pida, i) (LPCITEMIDLIST)(((LPBYTE)pida)+(pida)->aoffset[i+1])

diff --git a/gdk/win32/gdkdevicemanager-win32.c b/gdk/win32/gdkdevicemanager-win32.c
index ad850a8a249004a95579cd492bff27766f1a90a3..e5becd265fb854a94568fc914b90145bcb495120 100644 (file)
--- a/gdk/win32/gdkdevicemanager-win32.c
+++ b/gdk/win32/gdkdevicemanager-win32.c
@@ -29,6 +29,7 @@
 #include "gdkdevice-win32.h"
 #include "gdkdevice-virtual.h"
 #include "gdkdevice-wintab.h"
+#include "gdkeventsprivate.h"
 #include "gdkinput-winpointer.h"
 #include "gdkdisplayprivate.h"
 #include "gdkdisplay-win32.h"

diff --git a/gdk/win32/gdkdisplaymanager-win32.c b/gdk/win32/gdkdisplaymanager-win32.c
index ead0a4995072a2222e240200f1e085a8a354b3c8..7fa2f18a557aeac3df726eca3bbc7679b6b8d0f5 100644 (file)
--- a/gdk/win32/gdkdisplaymanager-win32.c
+++ b/gdk/win32/gdkdisplaymanager-win32.c
@@ -24,7 +24,6 @@
 #include "gdkprivate-win32.h"
 
 #include "gdkdisplaymanagerprivate.h"
-#include "gdkinternals.h"
 
 struct _GdkWin32DisplayManager
 {

diff --git a/gdk/win32/gdkdrag-win32.c b/gdk/win32/gdkdrag-win32.c
index 4482e1b3adef62a7c822960404e31f7cabf4110c..27dedf916d9a6159dae7a5ae26429a25bf4be938 100644 (file)
--- a/gdk/win32/gdkdrag-win32.c
+++ b/gdk/win32/gdkdrag-win32.c
@@ -25,13 +25,17 @@
  */
 
 #include "config.h"
-#include <string.h>
 
+#include "gdkwin32dnd.h"
+
+#include "gdkeventsprivate.h"
+#include "gdkseatprivate.h"
 #include "gdk-private.h"
 
-#include <io.h>
 #include <fcntl.h>
+#include <io.h>
 #include <math.h>
+#include <string.h>
 
 /*
  * Support for OLE-2 drag and drop added at Archaeopteryx Software, 2001
@@ -192,7 +196,6 @@
 #define COBJMACROS
 
 #include "gdkdrag.h"
-#include "gdkinternals.h"
 #include "gdkprivate-win32.h"
 #include "gdkwin32.h"
 #include "gdkwin32dnd.h"

diff --git a/gdk/win32/gdkdrop-win32.c b/gdk/win32/gdkdrop-win32.c
index d6e13a3d871a96132ed849ab41cd75fbb023d7fc..a4915537c13cfcd2f92a3436462480a39d345e03 100644 (file)
--- a/gdk/win32/gdkdrop-win32.c
+++ b/gdk/win32/gdkdrop-win32.c
@@ -42,7 +42,6 @@
 #include "gdkdropprivate.h"
 
 #include "gdkdrag.h"
-#include "gdkinternals.h"
 #include "gdkprivate-win32.h"
 #include "gdkwin32.h"
 #include "gdkwin32dnd.h"

diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index a705ee7e2a3c6237b2dca43e4d0d6c9074e03c40..2576a6711d4aba8a9ff096f5f19636f46cd732e2 100644 (file)
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -47,12 +47,13 @@
 #include <cairo-win32.h>
 
 #include "gdk.h"
+#include "gdkdevicemanager-win32.h"
 #include "gdkdisplayprivate.h"
+#include "gdkeventsprivate.h"
+#include "gdkglcontext-win32.h"
+#include "gdkkeysyms.h"
 #include "gdkmonitorprivate.h"
 #include "gdkwin32.h"
-#include "gdkkeysyms.h"
-#include "gdkglcontext-win32.h"
-#include "gdkdevicemanager-win32.h"
 #include "gdkdisplay-win32.h"
 #include "gdkdeviceprivate.h"
 #include "gdkdevice-virtual.h"

diff --git a/gdk/win32/gdkglcontext-win32-egl.c b/gdk/win32/gdkglcontext-win32-egl.c
index 50f57ebe4f23a55cf1994c74f31789496b2cbff1..0b30a8b481832d018b4c0824f33560dd10dd18ad 100644 (file)
--- a/gdk/win32/gdkglcontext-win32-egl.c
+++ b/gdk/win32/gdkglcontext-win32-egl.c
@@ -35,7 +35,6 @@
 
 #include "gdkglcontext.h"
 #include "gdksurface.h"
-#include "gdkinternals.h"
 #include "gdkintl.h"
 
 #include <cairo.h>

diff --git a/gdk/win32/gdkglcontext-win32-wgl.c b/gdk/win32/gdkglcontext-win32-wgl.c
index 31e0de74019ee3d8159eb90e572684769cce4738..97f3b8135606aaffaa34e69ad69d2b780831246c 100644 (file)
--- a/gdk/win32/gdkglcontext-win32-wgl.c
+++ b/gdk/win32/gdkglcontext-win32-wgl.c
@@ -35,7 +35,6 @@
 
 #include "gdkglcontext.h"
 #include "gdkprofilerprivate.h"
-#include "gdkinternals.h"
 #include "gdkintl.h"
 #include "gdksurface.h"
 

diff --git a/gdk/win32/gdkglcontext-win32.c b/gdk/win32/gdkglcontext-win32.c
index dea1a8d4fcf8733adf816d8323940d2ab37ad749..ec5c51789fb38b374f3d8f70ce7aa7c1b999d097 100644 (file)
--- a/gdk/win32/gdkglcontext-win32.c
+++ b/gdk/win32/gdkglcontext-win32.c
@@ -35,7 +35,6 @@
 
 #include "gdkglcontext.h"
 #include "gdksurface.h"
-#include "gdkinternals.h"
 #include "gdkintl.h"
 
 #include <cairo.h>

diff --git a/gdk/win32/gdkglcontext-win32.h b/gdk/win32/gdkglcontext-win32.h
index f8ba71159f57daf530ffa56ed858e6cb1168926d..5bb122d16e57ef11fe4bb8b0ec3e95b12c0d0341 100644 (file)
--- a/gdk/win32/gdkglcontext-win32.h
+++ b/gdk/win32/gdkglcontext-win32.h
@@ -31,7 +31,6 @@
 #include "gdkglcontextprivate.h"
 #include "gdkdisplayprivate.h"
 #include "gdksurface.h"
-#include "gdkinternals.h"
 
 G_BEGIN_DECLS
 

diff --git a/gdk/win32/gdkhdataoutputstream-win32.c b/gdk/win32/gdkhdataoutputstream-win32.c
index 95a57981f05c4d89b8a7c9b76fe7194a96d71609..0075d0b66c0ff88dc19131bda9dc4562cc207f74 100644 (file)
--- a/gdk/win32/gdkhdataoutputstream-win32.c
+++ b/gdk/win32/gdkhdataoutputstream-win32.c
@@ -31,7 +31,6 @@
 #include "gdkwin32display.h"
 #include "gdkwin32surface.h"
 
-#include "gdkinternals.h"
 
 typedef struct _GdkWin32HDataOutputStreamPrivate  GdkWin32HDataOutputStreamPrivate;
 

diff --git a/gdk/win32/gdkkeys-win32.c b/gdk/win32/gdkkeys-win32.c
index 981f52ab54bd92a3c35805c71c3c21b04f58f882..70d65e97fbd76915a49e53e90142e1743efd277d 100644 (file)
--- a/gdk/win32/gdkkeys-win32.c
+++ b/gdk/win32/gdkkeys-win32.c
@@ -23,20 +23,22 @@
  */
 #include "config.h"
 
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <limits.h>
-#include <errno.h>
+#include "gdkwin32keys.h"
 
 #include "gdk.h"
 
 #include "gdkprivate-win32.h"
-#include "gdkinternals.h"
+#include "gdkdebug.h"
+#include "gdkdisplayprivate.h"
 #include "gdkkeysyms.h"
 #include "gdkkeysprivate.h"
-#include "gdkwin32keys.h"
+
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <limits.h>
+#include <errno.h>
 
 #define GDK_MOD2_MASK (1 << 4)
 

diff --git a/gdk/win32/gdkmain-win32.c b/gdk/win32/gdkmain-win32.c
index cde3c789f1d369d2b6d5a9aaed20b37720a83652..1a52f706e5c9f6733002d69cea0c7c3abaaf99ce 100644 (file)
--- a/gdk/win32/gdkmain-win32.c
+++ b/gdk/win32/gdkmain-win32.c
@@ -32,8 +32,8 @@
 #include <io.h>
 
 #include "gdk.h"
+#include "gdkdebug.h"
 #include "gdkkeysyms.h"
-#include "gdkinternals.h"
 #include "gdkintl.h"
 #include "gdkprivate-win32.h"
 #include "gdkwin32.h"

diff --git a/gdk/win32/gdkprivate-win32.h b/gdk/win32/gdkprivate-win32.h
index bd27cb5ef10275385938914ab21efc8ede48bfc6..01d66f3073e656f71ae229e00df9aec02061a9e5 100644 (file)
--- a/gdk/win32/gdkprivate-win32.h
+++ b/gdk/win32/gdkprivate-win32.h
@@ -34,7 +34,6 @@
 #include <gdk/win32/gdkclipdrop-win32.h>
 //#include <gdk/win32/gdkselection-win32.h>
 
-#include "gdkinternals.h"
 
 #include "config.h"
 

diff --git a/gdk/win32/gdksurface-win32.h b/gdk/win32/gdksurface-win32.h
index 88a19f80180ee6abe67fee8be515a853070f316a..293e58d4fccf382849ac4016861343a215cc4154 100644 (file)
--- a/gdk/win32/gdksurface-win32.h
+++ b/gdk/win32/gdksurface-win32.h
@@ -30,7 +30,6 @@
 #include "gdk/win32/gdkwin32surface.h"
 #include "gdk/gdksurfaceprivate.h"
 #include "gdk/gdkcursor.h"
-#include "gdk/gdkinternals.h"
 
 #include <windows.h>
 

diff --git a/gdk/win32/gdkwin32dnd-private.h b/gdk/win32/gdkwin32dnd-private.h
index 2fab027b1d0385a204154c0ef5fc9f9b79dd7a89..a9c2d254fbb0531806b086f6a580edfbdb5b8541 100644 (file)
--- a/gdk/win32/gdkwin32dnd-private.h
+++ b/gdk/win32/gdkwin32dnd-private.h
@@ -24,6 +24,8 @@
 
 #include <gdk/gdk.h>
 
+#include "gdk/gdkdragprivate.h"
+
 G_BEGIN_DECLS
 
 typedef struct _GdkWin32DragUtilityData GdkWin32DragUtilityData;